From fe3558c78649d30eb5c1bc5f6d630eba2e0fa0c0 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 13 Mar 2004 15:37:18 +0000 Subject: [PATCH] Revert last change; it causes problems for pastes from other applications; Sat Mar 13 10:34:03 2004 Owen Taylor * gtk/gtktextview.c gtk/gtktextbuffer.c: Revert last change; it causes problems for pastes from other applications; see comments in bugzilla for #81880. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktextbuffer.c | 2 -- gtk/gtktextview.c | 19 +++---------------- 7 files changed, 33 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index b69d05e491..6fe778221e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Mar 13 10:34:03 2004 Owen Taylor + + * gtk/gtktextview.c gtk/gtktextbuffer.c: Revert last change; + it causes problems for pastes from other applications; see + comments in bugzilla for #81880. + Sat Mar 13 02:55:51 2004 Matthias Clasen Fix middle button pasting in the TextView (#81880, reported diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b69d05e491..6fe778221e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Mar 13 10:34:03 2004 Owen Taylor + + * gtk/gtktextview.c gtk/gtktextbuffer.c: Revert last change; + it causes problems for pastes from other applications; see + comments in bugzilla for #81880. + Sat Mar 13 02:55:51 2004 Matthias Clasen Fix middle button pasting in the TextView (#81880, reported diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b69d05e491..6fe778221e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Mar 13 10:34:03 2004 Owen Taylor + + * gtk/gtktextview.c gtk/gtktextbuffer.c: Revert last change; + it causes problems for pastes from other applications; see + comments in bugzilla for #81880. + Sat Mar 13 02:55:51 2004 Matthias Clasen Fix middle button pasting in the TextView (#81880, reported diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b69d05e491..6fe778221e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Mar 13 10:34:03 2004 Owen Taylor + + * gtk/gtktextview.c gtk/gtktextbuffer.c: Revert last change; + it causes problems for pastes from other applications; see + comments in bugzilla for #81880. + Sat Mar 13 02:55:51 2004 Matthias Clasen Fix middle button pasting in the TextView (#81880, reported diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b69d05e491..6fe778221e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Mar 13 10:34:03 2004 Owen Taylor + + * gtk/gtktextview.c gtk/gtktextbuffer.c: Revert last change; + it causes problems for pastes from other applications; see + comments in bugzilla for #81880. + Sat Mar 13 02:55:51 2004 Matthias Clasen Fix middle button pasting in the TextView (#81880, reported diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index 0a9f947451..b327d50f2f 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -2936,8 +2936,6 @@ pre_paste_prep (ClipboardRequest *request_data, if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end)) *insert_point = start; } - - gtk_text_buffer_move_mark_by_name (buffer, "insert", insert_point); } static void diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index a501ecd855..df8d877800 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -3931,7 +3931,6 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event) else if (event->button == 2) { GtkTextIter iter; - GtkTextMark *mark; gtk_text_layout_get_iter_at_pixel (text_view->layout, &iter, @@ -3939,21 +3938,9 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event) event->y + text_view->yoffset); gtk_text_buffer_paste_clipboard (get_buffer (text_view), - gtk_widget_get_clipboard (widget, GDK_SELECTION_PRIMARY), - &iter, - text_view->editable); - - mark = gtk_text_buffer_get_mark (get_buffer (text_view), "insert"); - gtk_text_buffer_get_iter_at_mark (get_buffer (text_view), - &iter, - mark); - - gtk_text_buffer_place_cursor (get_buffer (text_view), &iter); - - DV(g_print (G_STRLOC": scrolling onscreen\n")); - gtk_text_view_scroll_mark_onscreen (text_view, - gtk_text_buffer_get_mark (get_buffer (text_view), - "insert")); + gtk_widget_get_clipboard (widget, GDK_SELECTION_PRIMARY), + &iter, + text_view->editable); return TRUE; } else if (event->button == 3) -- 2.30.2